From 498a8bd404db86b6b46662ccde5a51344b212187 Mon Sep 17 00:00:00 2001 From: Robert Fairley Date: Wed, 17 Apr 2019 12:03:55 -0400 Subject: [PATCH] tests/test-config: Fix regex causing Debian test failure Fix CI failure due to mismatching quotes in the error output given between Fedora and Debian test suites. Example of the error in Debian Stretch: https://api.travis-ci.org/v3/job/519335717/log.txt Closes: #1839 Approved by: cgwalters --- tests/test-config.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/test-config.sh b/tests/test-config.sh index 483cff41..7e913d32 100755 --- a/tests/test-config.sh +++ b/tests/test-config.sh @@ -76,7 +76,9 @@ assert_not_file_has_content repo/config "lock-timeout-secs=" if ${CMD_PREFIX} ostree config --repo=repo get core.lock-timeout-secs 2>err.txt; then assert_not_reached "ostree config get should not work after unsetting a key" fi -assert_file_has_content err.txt "error: Key file does not have key “lock-timeout-secs” in group “core”" +# Check for any character where quotation marks would be as they appear differently in the Fedora and Debian +# test suites (“” and '' respectively). See: https://github.com/ostreedev/ostree/pull/1839 +assert_file_has_content err.txt "error: Key file does not have key .lock-timeout-secs. in group .core." # Check that it's idempotent ${CMD_PREFIX} ostree config --repo=repo unset core.lock-timeout-secs -- 2.30.2